Fix a typo

The property is called font-variant-alternates, not -alternatives.
Correct this everywhere.

diff --git a/gtk/gtkcssshorthandpropertyimpl.c b/gtk/gtkcssshorthandpropertyimpl.c
index c2081f48cbd1ec2c27520a8f19657a704f625249..40b96c6a1dc8affb218ff8a048412b8b4c850116 100644 (file)
--- a/gtk/gtkcssshorthandpropertyimpl.c
+++ b/gtk/gtkcssshorthandpropertyimpl.c
@@ -1272,7 +1272,7 @@ _gtk_css_shorthand_property_init_properties (void)
   const char *animation_subproperties[] = { "animation-name", "animation-iteration-count", "animation-duration", "animation-delay", 
                                             "animation-timing-function", "animation-direction", "animation-fill-mode", NULL };
   const char *text_decoration_subproperties[] = { "text-decoration-line", "text-decoration-style", "text-decoration-color", NULL };
-  const char *font_variant_subproperties[] = { "font-variant-ligatures", "font-variant-position", "font-variant-caps", "font-variant-numeric", "font-variant-alternatives", "font-variant-east-asian", NULL };
+  const char *font_variant_subproperties[] = { "font-variant-ligatures", "font-variant-position", "font-variant-caps", "font-variant-numeric", "font-variant-alternates", "font-variant-east-asian", NULL };
 
   const char **all_subproperties;
 

diff --git a/gtk/gtkcssstyle.c b/gtk/gtkcssstyle.c
index f6eaa35764d7283453725e709a4be10ca8d5411b..245d48a428123db81f30ff2690d780eb92f477bf 100644 (file)
--- a/gtk/gtkcssstyle.c
+++ b/gtk/gtkcssstyle.c
@@ -230,7 +230,7 @@ gtk_css_style_get_pango_attributes (GtkCssStyle *style)
   GtkCssValue *position;
   GtkCssValue *caps;
   GtkCssValue *numeric;
-  GtkCssValue *alternatives;
+  GtkCssValue *alternates;
   GtkCssValue *east_asian;
   GString *s;
   int i;
@@ -371,10 +371,10 @@ gtk_css_style_get_pango_attributes (GtkCssStyle *style)
         g_string_append (s, "zero 1");
     }
 
-  alternatives = gtk_css_style_get_value (style, GTK_CSS_PROPERTY_FONT_VARIANT_ALTERNATIVES);
-  for (i = 0; i < _gtk_css_array_value_get_n_values (alternatives); i++)
+  alternates = gtk_css_style_get_value (style, GTK_CSS_PROPERTY_FONT_VARIANT_ALTERNATES);
+  for (i = 0; i < _gtk_css_array_value_get_n_values (alternates); i++)
     {
-      GtkCssValue *value = _gtk_css_array_value_get_nth (alternatives, i);
+      GtkCssValue *value = _gtk_css_array_value_get_nth (alternates, i);
       if (s->len > 0) g_string_append (s, ", ");
       if (strcmp (_gtk_css_ident_value_get (value), "historical-forms") == 0)
         g_string_append (s, "hist 1");

diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c
index adc7ea35efe25335c2d14433fab1b4474f7b27c6..c79121950624967b8a72e6c124e89e48413781b0 100644 (file)
--- a/gtk/gtkcssstylepropertyimpl.c
+++ b/gtk/gtkcssstylepropertyimpl.c
@@ -716,8 +716,8 @@ parse_font_variant_numeric (GtkCssStyleProperty *property,
 }
 
 static GtkCssValue *
-parse_font_variant_alternatives (GtkCssStyleProperty *property,
-                                 GtkCssParser        *parser)
+parse_font_variant_alternates (GtkCssStyleProperty *property,
+                               GtkCssParser        *parser)
 {
   GtkCssValue *value = NULL;
 
@@ -1307,12 +1307,12 @@ _gtk_css_style_property_init_properties (void)
                                           parse_font_variant_numeric,
                                           NULL,
                                           _gtk_css_array_value_new (_gtk_css_ident_value_new ("normal")));
-  gtk_css_style_property_register        ("font-variant-alternatives",
-                                          GTK_CSS_PROPERTY_FONT_VARIANT_ALTERNATIVES,
+  gtk_css_style_property_register        ("font-variant-alternates",
+                                          GTK_CSS_PROPERTY_FONT_VARIANT_ALTERNATES,
                                           G_TYPE_NONE,
                                           0,
                                           GTK_CSS_AFFECTS_TEXT | GTK_CSS_AFFECTS_TEXT_ATTRS,
-                                          parse_font_variant_alternatives,
+                                          parse_font_variant_alternates,
                                           NULL,
                                           _gtk_css_array_value_new (_gtk_css_ident_value_new ("normal")));
   gtk_css_style_property_register        ("font-variant-east-asian",

diff --git a/gtk/gtkcsstypesprivate.h b/gtk/gtkcsstypesprivate.h
index a7fe8c9d7dbfed1a566e1e6a6c58449acbceb837..a56c345e32bfea1f31795fe3d6923e2854bade02 100644 (file)
--- a/gtk/gtkcsstypesprivate.h
+++ b/gtk/gtkcsstypesprivate.h
@@ -167,7 +167,7 @@ enum { /*< skip >*/
   GTK_CSS_PROPERTY_FONT_VARIANT_POSITION,
   GTK_CSS_PROPERTY_FONT_VARIANT_CAPS,
   GTK_CSS_PROPERTY_FONT_VARIANT_NUMERIC,
-  GTK_CSS_PROPERTY_FONT_VARIANT_ALTERNATIVES,
+  GTK_CSS_PROPERTY_FONT_VARIANT_ALTERNATES,
   GTK_CSS_PROPERTY_FONT_VARIANT_EAST_ASIAN,
   GTK_CSS_PROPERTY_TEXT_SHADOW,
   GTK_CSS_PROPERTY_BOX_SHADOW,